490b8054ce34f0274ca7b8f7774ed517a9d18a00,src/org/opencms/importexport/CmsImportVersion2.java,CmsImportVersion2,mergePageFile,#String#,698

Before Change


        CmsFile pagefile = m_cms.readFile(resname);
        // now parse the content of the headerfile to identify the master template used by this
        // page
        InputStream in = new ByteArrayInputStream(pagefile.getContents());
        Document contentXml;
        CmsFile bodyfile;
        

After Change


        
        // get the header file
        CmsFile pagefile = m_cms.readFile(resname);
        contentXml = CmsImport.getXmlDocument(pagefile.getContents());
        
        // get the <masterTemplate> node to check the content.
        // this node contains the name of the template file